Merge "/charger->/system/bin/charger" am: bd1e386b69 am: d439ae48e8 am: 0116446151 Change-Id: I544420087ba1ac17b0027ad9b67640ab320692d4